auto merge of #131 : alexcrichton/cargo/update-to-master, r=update
authorbors <bors@rust-lang.org>
Mon, 7 Jul 2014 13:28:45 +0000 (13:28 +0000)
committerbors <bors@rust-lang.org>
Mon, 7 Jul 2014 13:28:45 +0000 (13:28 +0000)

Trivial merge